Merge remote-tracking branch 'origin/master' into issue2266
authorRyan Quattlebaum <ryan.quattlebaum@icloud.com>
Fri, 8 Apr 2016 16:57:34 +0000 (12:57 -0400)
committerRyan Quattlebaum <ryan.quattlebaum@icloud.com>
Fri, 8 Apr 2016 16:57:34 +0000 (12:57 -0400)

Trivial merge